Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 9 Nov 2011 18:45:49 +0000 (10:45 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 9 Nov 2011 18:45:49 +0000 (10:45 -0800)
commit97f40d36ac942d091a7695138985d4c3364b0c0a
tree9c71a4968f0eb5bf74f731fb1d7b07a0a3bd6fb1
parent63db01c969c7adcb91b48a09ab3efdf28b3fbb46
parent7eff62c4af02c637b765007dc1d5f3eb7a95cd69
Merge from trunk.